From: Bernd Zeimetz <bernd@bzed.de>
Date: Wed, 16 May 2012 19:16:00 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~162
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0754cb6136b24857718d3ac34d356bb24ab1046d;p=gpsbabel.git

Merge branch 'upstream'
---

0754cb6136b24857718d3ac34d356bb24ab1046d